Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for Java 7 updates >= 10 #6

Merged
merged 3 commits into from Feb 6, 2012
Merged

Support for Java 7 updates >= 10 #6

merged 3 commits into from Feb 6, 2012

Conversation

ebourg
Copy link
Contributor

@ebourg ebourg commented Feb 6, 2012

The current detection code assumes the Java 7 update has a single digit. I reworked this part of the code with some regular expressions to support any number of digits.

This patch also aligns the version scheme with the sun-java6 package (i.e version 6.30 for Java 6u30 instead of 1.6.0+update30)

@cedricpineau
Copy link
Owner

I prefer not to merge this one as it goes a bit to far in code reduction with several fallbacks :

  • min_size is not set per binary any more
  • 1.6.0+updateXX seems to be the Debian scheme and I want to keep this scripts with the one I use in the debian Java-package.
  • I'm not sure BASH_REMATCH works with dash and I would like to keep this as a goal
  • Code is longer but clearer the way it was, easier to add new entries to (my feeling)

I'll fix the two digit Java 7 update with a great duplication of entries :-)

@ebourg
Copy link
Contributor Author

ebourg commented Feb 6, 2012

  • How is determined min_size? Could it be computed with the size of the archive instead of hardcoding the value in the script?
  • Regarding the version, I simply followed the scheme of the sun-java6 package. Since the packages generated by java-package will most probably replace sun-java6 I think it's wise to follow this pattern.
  • I confirm BASH_REMATCH doesn't work with dash, however there are other bashisms that prevent the script from running with dash. I thought that was ok as long as the generated packages can be installed with dash.
  • The purpose of the patch is to not add new entries in the future, it could work with jdk10u23 in 15 years ;)

@cedricpineau cedricpineau reopened this Feb 6, 2012
@cedricpineau
Copy link
Owner

  • Yes it probably can. It's approximately the size of expanded binary archive. The goal is just to check disk space.
  • It could. After all, current java-package output is not compliant with openjdk scheme on Debian neither..
  • Well, it's a goal, I know it's not dash compliant right now.
  • Oh yes, I didn't notice that :-/ !
    Ok then, let's go. I'll see what can fit in the Debian packaged version later.

cedricpineau added a commit that referenced this pull request Feb 6, 2012
Support for Java 7 updates >= 10
@cedricpineau cedricpineau merged commit 2e7605e into cedricpineau:master Feb 6, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants